From 6120f11ed3fa70f39570df272a0d0da4391a4a95 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Fri, 12 Apr 2019 06:48:28 +0200
Subject: [PATCH] reftests: Fix GtkFixed layout properties

GtkFixed was still using "x" and "y", when it should have been using
"position".
---
 testsuite/reftests/background-position.ref.ui | 27 ++++-------
 .../reftests/box-shadow-spec-inset.ref.ui     | 48 ++++---------------
 .../reftests/fixed-widget-stacking.ref.ui     |  3 +-
 testsuite/reftests/fixed-widget-stacking.ui   |  3 +-
 testsuite/reftests/label-shadows.ref.ui       | 12 ++---
 5 files changed, 23 insertions(+), 70 deletions(-)

diff --git a/testsuite/reftests/background-position.ref.ui b/testsuite/reftests/background-position.ref.ui
index 627a16f656..10d9ec9662 100644
--- a/testsuite/reftests/background-position.ref.ui
+++ b/testsuite/reftests/background-position.ref.ui
@@ -15,8 +15,7 @@
             <property name="receives_default">1</property>
             <property name="name">ref</property>
             <layout>
-              <property name="x">10</property>
-              <property name="y">10</property>
+              <property name="position">translate(10, 10)</property>
             </layout>
           </object>
         </child>
@@ -28,8 +27,7 @@
             <property name="receives_default">1</property>
             <property name="name">ref</property>
             <layout>
-              <property name="x">40</property>
-              <property name="y">10</property>
+              <property name="position">translate(40, 10)</property>
             </layout>
           </object>
         </child>
@@ -41,8 +39,7 @@
             <property name="receives_default">1</property>
             <property name="name">ref</property>
             <layout>
-              <property name="x">80</property>
-              <property name="y">20</property>
+              <property name="position">translate(80, 20)</property>
             </layout>
           </object>
         </child>
@@ -54,8 +51,7 @@
             <property name="receives_default">1</property>
             <property name="name">ref</property>
             <layout>
-              <property name="x">20</property>
-              <property name="y">60</property>
+              <property name="position">translate(20, 60)</property>
             </layout>
           </object>
         </child>
@@ -67,8 +63,7 @@
             <property name="receives_default">1</property>
             <property name="name">ref</property>
             <layout>
-              <property name="x">60</property>
-              <property name="y">40</property>
+              <property name="position">translate(60, 40)</property>
             </layout>
           </object>
         </child>
@@ -80,8 +75,7 @@
             <property name="receives_default">1</property>
             <property name="name">ref</property>
             <layout>
-              <property name="x">100</property>
-              <property name="y">50</property>
+              <property name="position">translate(100, 50)</property>
             </layout>
           </object>
         </child>
@@ -93,8 +87,7 @@
             <property name="receives_default">1</property>
             <property name="name">ref</property>
             <layout>
-              <property name="x">10</property>
-              <property name="y">90</property>
+              <property name="position">translate(10, 90)</property>
             </layout>
           </object>
         </child>
@@ -106,8 +99,7 @@
             <property name="receives_default">1</property>
             <property name="name">ref</property>
             <layout>
-              <property name="x">40</property>
-              <property name="y">90</property>
+              <property name="position">translate(40, 90)</property>
             </layout>
           </object>
         </child>
@@ -119,8 +111,7 @@
             <property name="receives_default">1</property>
             <property name="name">ref</property>
             <layout>
-              <property name="x">100</property>
-              <property name="y">100</property>
+              <property name="position">translate(100, 100)</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/box-shadow-spec-inset.ref.ui b/testsuite/reftests/box-shadow-spec-inset.ref.ui
index 9441593c48..1246a1c6ce 100644
--- a/testsuite/reftests/box-shadow-spec-inset.ref.ui
+++ b/testsuite/reftests/box-shadow-spec-inset.ref.ui
@@ -50,10 +50,6 @@
                   <class name="reference-background"/>
                   <class name="column1"/>
                 </style>
-                <layout>
-                  <property name="x">0</property>
-                  <property name="y">0</property>
-                </layout>
               </object>
             </child>
             <child>
@@ -65,8 +61,7 @@
                   <class name="reference-padding-radius"/>
                 </style>
                 <layout>
-                  <property name="x">5</property>
-                  <property name="y">5</property>
+                  <property name="position">translate(5, 5)</property>
                 </layout>
               </object>
             </child>
@@ -80,8 +75,7 @@
                   <class name="column1"/>
                 </style>
                 <layout>
-                  <property name="x">20</property>
-                  <property name="y">20</property>
+                  <property name="position">translate(20, 20)</property>
                 </layout>
               </object>
             </child>
@@ -93,10 +87,6 @@
                   <class name="reference-border"/>
                   <class name="column1"/>
                 </style>
-                <layout>
-                  <property name="x">0</property>
-                  <property name="y">0</property>
-                </layout>
               </object>
             </child>
             <layout>
@@ -118,10 +108,6 @@
                   <class name="reference-background"/>
                   <class name="column2"/>
                 </style>
-                <layout>
-                  <property name="x">0</property>
-                  <property name="y">0</property>
-                </layout>
               </object>
             </child>
             <child>
@@ -133,8 +119,7 @@
                   <class name="column2"/>
                 </style>
                 <layout>
-                  <property name="x">5</property>
-                  <property name="y">5</property>
+                  <property name="position">translate(5, 5)</property>
                 </layout>
               </object>
             </child>
@@ -147,8 +132,7 @@
                   <class name="column2"/>
                 </style>
                 <layout>
-                  <property name="x">20</property>
-                  <property name="y">20</property>
+                  <property name="position">translate(20, 20)</property>
                 </layout>
               </object>
             </child>
@@ -170,10 +154,6 @@
                   <class name="reference-background"/>
                   <class name="column1"/>
                 </style>
-                <layout>
-                  <property name="x">0</property>
-                  <property name="y">0</property>
-                </layout>
               </object>
             </child>
             <child>
@@ -185,8 +165,7 @@
                   <class name="reference-padding-radius"/>
                 </style>
                 <layout>
-                  <property name="x">5</property>
-                  <property name="y">5</property>
+                  <property name="position">translate(5, 5)</property>
                 </layout>
               </object>
             </child>
@@ -200,8 +179,7 @@
                   <class name="column1"/>
                 </style>
                 <layout>
-                  <property name="x">30</property>
-                  <property name="y">30</property>
+                  <property name="position">translate(30, 30)</property>
                 </layout>
               </object>
             </child>
@@ -213,10 +191,6 @@
                   <class name="reference-border"/>
                   <class name="column1"/>
                 </style>
-                <layout>
-                  <property name="x">0</property>
-                  <property name="y">0</property>
-                </layout>
               </object>
             </child>
             <layout>
@@ -238,10 +212,6 @@
                   <class name="reference-background"/>
                   <class name="column2"/>
                 </style>
-                <layout>
-                  <property name="x">0</property>
-                  <property name="y">0</property>
-                </layout>
               </object>
             </child>
             <child>
@@ -253,8 +223,7 @@
                   <class name="column2"/>
                 </style>
                 <layout>
-                  <property name="x">5</property>
-                  <property name="y">5</property>
+                  <property name="position">translate(5, 5)</property>
                 </layout>
               </object>
             </child>
@@ -267,8 +236,7 @@
                   <class name="column2"/>
                 </style>
                 <layout>
-                  <property name="x">30</property>
-                  <property name="y">30</property>
+                  <property name="position">translate(30, 30)</property>
                 </layout>
               </object>
             </child>
diff --git a/testsuite/reftests/fixed-widget-stacking.ref.ui b/testsuite/reftests/fixed-widget-stacking.ref.ui
index d40e3f0bac..65ae50f8e9 100644
--- a/testsuite/reftests/fixed-widget-stacking.ref.ui
+++ b/testsuite/reftests/fixed-widget-stacking.ref.ui
@@ -22,8 +22,7 @@ TEST123</property>
             <property name="can_focus">1</property>
             <property name="buffer">textbuffer1</property>
             <layout>
-              <property name="x">50</property>
-              <property name="y">50</property>
+              <property name="position">translate(50, 50)</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/fixed-widget-stacking.ui b/testsuite/reftests/fixed-widget-stacking.ui
index e4737db3d9..5be91e13cc 100644
--- a/testsuite/reftests/fixed-widget-stacking.ui
+++ b/testsuite/reftests/fixed-widget-stacking.ui
@@ -27,8 +27,7 @@ TEST123</property>
               </object>
             </child>
             <layout>
-              <property name="x">50</property>
-              <property name="y">50</property>
+              <property name="position">translate(50, 50)</property>
             </layout>
           </object>
         </child>
diff --git a/testsuite/reftests/label-shadows.ref.ui b/testsuite/reftests/label-shadows.ref.ui
index 6523efea03..e4f582acfd 100644
--- a/testsuite/reftests/label-shadows.ref.ui
+++ b/testsuite/reftests/label-shadows.ref.ui
@@ -16,8 +16,7 @@
                   <class name="no-shadow"/>
                 </style>
                 <layout>
-                  <property name="x">2</property>
-                  <property name="y">2</property>
+                  <property name="position">translate(2, 2)</property>
                 </layout>
               </object>
             </child>
@@ -49,8 +48,7 @@
                   <class name="no-shadow"/>
                 </style>
                 <layout>
-                  <property name="x">2</property>
-                  <property name="y">0</property>
+                  <property name="position">translate(2, 0)</property>
                 </layout>
               </object>
             </child>
@@ -82,8 +80,7 @@
                   <class name="no-shadow"/>
                 </style>
                 <layout>
-                  <property name="x">0</property>
-                  <property name="y">0</property>
+                  <property name="position">translate(0, 0)</property>
                 </layout>
               </object>
             </child>
@@ -115,8 +112,7 @@
                   <class name="no-shadow"/>
                 </style>
                 <layout>
-                  <property name="x">0</property>
-                  <property name="y">2</property>
+                  <property name="position">translate(0, 2)</property>
                 </layout>
               </object>
             </child>
-- 
2.30.2